GtkDialog: Set window titles in header bars

This is fallout from the recent dialog changes. We don't set the
headerbar as titlebar early enough anymore, so when the window title
gets set, it does not get passed on to the headerbar. So, re-set it
manually when the titlebar is put in place.

https://bugzilla.gnome.org/show_bug.cgi?id=733099

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index c8dd5829dd80d5d14562d0874ac09fe42df97035..3091f9f84cdfdc04da89042a2376e2e3150137a2 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -460,6 +460,7 @@ gtk_dialog_constructed (GObject *object)
       GList *children, *l;
 
       gtk_window_set_titlebar (GTK_WINDOW (dialog), priv->headerbar);
+      gtk_window_set_title (GTK_WINDOW (dialog), gtk_window_get_title (GTK_WINDOW (dialog)));
 
       children = gtk_container_get_children (GTK_CONTAINER (priv->action_area));
       for (l = children; l != NULL; l = l->next)